From 1e52826824aa236e1fb27e9aa21c72432dbf399a Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 25 Aug 2009 14:58:07 +0100 Subject: [PATCH] xen/xsm/flask: Fix Flask MLS context generation Signed-off-by: Stephen D. Smalley --- xen/xsm/flask/ss/mls.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/xsm/flask/ss/mls.c b/xen/xsm/flask/ss/mls.c index aee9fc312a..bbe7a49a61 100644 --- a/xen/xsm/flask/ss/mls.c +++ b/xen/xsm/flask/ss/mls.c @@ -105,7 +105,7 @@ void mls_sid_to_context(struct context *context, char **scontext) { memcpy(scontextp, policydb.p_sens_val_to_name[context->range.level[l].sens - 1], - strlen(policydb.p_sens_val_to_name[context->range.level[l].sens - 1])); + strlen(policydb.p_sens_val_to_name[context->range.level[l].sens - 1])+1); scontextp += strlen(scontextp); /* categories */ @@ -124,7 +124,7 @@ void mls_sid_to_context(struct context *context, char **scontext) else *scontextp++ = ','; nm = policydb.p_cat_val_to_name[prev]; - memcpy(scontextp, nm, strlen(nm)); + memcpy(scontextp, nm, strlen(nm)+1); scontextp += strlen(nm); } if ( prev < 0 ) @@ -132,7 +132,7 @@ void mls_sid_to_context(struct context *context, char **scontext) else *scontextp++ = ','; nm = policydb.p_cat_val_to_name[i]; - memcpy(scontextp, nm, strlen(nm)); + memcpy(scontextp, nm, strlen(nm)+1); scontextp += strlen(nm); head = i; } @@ -146,7 +146,7 @@ void mls_sid_to_context(struct context *context, char **scontext) else *scontextp++ = ','; nm = policydb.p_cat_val_to_name[prev]; - memcpy(scontextp, nm, strlen(nm)); + memcpy(scontextp, nm, strlen(nm)+1); scontextp += strlen(nm); } -- 2.30.2